Merge tag 'upstream/3.002.001'
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Sep 2014 12:13:21 +0000 (14:13 +0200)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Sep 2014 12:13:21 +0000 (14:13 +0200)
commiteeecdcb43a2d0c8dfca753f072c5c7327b675dc0
treeffca6c8fea74e4ba1804b2ff2e9553cc4b92d7db
parent3aa86515cc3f24f535d1dde5eab46a2378e7103f
parent37f741cc9ca317e295ad0606d045fb92850c0157
Merge tag 'upstream/3.002.001'

Upstream version 3.002.001